Patches to get project to build

Deleted .idea/workspace.xml :)