Diploma project Summer 2012