take a shot before a huge refactor v
finish refactor
Merge remote-tracking branch 'origin/master'