Refactored to base model
Added functional test
Merge pull request #48 from dantleech/refactored_to_base

Refactored to base