Lots of cleaning up needs done