First commint of the cleaned up example1