status coming along
Merge pull request #15 from kmyr/development

status coming along