Added core functionality
Merge pull request #2 from ewu-wardj/master

Added core functionality