gutted alot of stuff
more deleting =(