Hmm......
Basic functionality now; should have wrote tests first.... ughhh
Updated version again
Merge branch 'dev-branch'