Massive updates, project now in a working state