Final version

Cleaned up significantly, finished the project.