Yeah...huge changes
Removed crap