FEATURE COMPLETE
Merge pull request #18 from mikedao/tying_it_together

FEATURE COMPLETE