Refactored everything
Refactored everything
resetting head and cleaned up project
trying to fix comflicts