just rebased 30 interweaving commits into 6 coherent changes ama

@nbsp are you still sane

@eris yeah
it's not that hard you just need patience
but everyone thinks of me as some sort of git witch so i'm enjoying the spotlight