Final comit

Project done and working!