Merge pull request #115 from bradbishop/refactoring

More skeleton refactoring