Updated Master with new correct code for the inital start of the
project.