Refactoring and Planning for new Direction
Refactoring and minor Merging
merging
merging