I dont know what I am committing right now
Closes #2