Cleaning up
Cleaning import bugs and other stuff. Got rid of Locker class.
Initial.