Completed Refactoring for Solution 6 -10

Completed Refactoring now, going to add functionality.