Ek feedback

Refactored stuff in the commits below. We can go over questions you have in person. LMK