Recommit to fix stuff
Fourth commit
Moved everything