Refactored, moved to composition model rather than monkey patch
0.1.0
lint