Final (for now)

Final Submission for Class, features still missing