Fixed merge conflicts
Project builds successfully
IoC/DI partially implemented
Validation (ie: Quiz) is still broken