Fix issue #1. There was also some major issues with things not being commited. Recreated all things.