Project 1 done - only some beautify and document left