Recommitting the project because GitHub crashed
Loads of Hacky Code