Merge pull request #101 from bradbishop/refactoring

skeleton refactoring