Finished Mode

Updated Mode to better fit assignment requirements.