Initial add of all working code