Final submission

Still a lot of work to do but the semester is over