Refactor

We refactored a few things, aka "we fixed yo shi*". 

Please pull in our branch to see commit notes and changes. Yo app is much mo fasta now.