Fully Functional

Completed Phase 1 but still works without Phase 2 yet