Major commit of intiial working code