Feature/solution setup

Completed code cleanup and should be ready to review this feature.