Basically finished

Just some commenting to do I guess