Almost finished

Almost finished - student project