Finished P0

Changed tabs to spaces to each part of the code.
Added some missing object dependencies.