Inital commit
Fix everything