Initial draft; also moved everything into template to reflect grading instructions