proton 2016-08-21

I think we should refactor the init function. It’s getting wayy too big

and in general, add more comments / make function names more obvious. Code needs some late-summer love