Initial implementation working
Merge pull request #1 from KoryNunn/initial-implementation

Initial implementation working