Final commit

Project is pretty much finished.