Working Deliverable 3...minor bugs but still presentable