Final project after presentation

Little bit cleaned up and commented ;)