Good work towards puppy implementation.