Sometimes i forget to commit :(
This is getting so big. Time to think