Initial Commit of working code