Feature Complete. Ready To Merge.

Presentation and backend logic complete. Ready to merge to main branch.