Initial commit v2
Finished spacing