I think i need to be cleaned up