Bunch of stuff again

Managing my git habits is hard

Closes #41