in progress and broken
more refactoring
Merge pull request #1 from ross2411/Development

Development