Class'd things up
Added flake rules
Merge pull request #11 from baude/wip

Class'd things up