Merge pull request #8 from shanegibbs/development

Partial function impl