oofta, testing complete-ish, now lets glue it together
working better naow
first major milestone, yay
a little bit of other stuffs before merge
Merge pull request #1 from cpeddecord/refactored-methods

Refactored methods