Added project solution and some code