Move code in from puddle