Added the most recent set of working code