DRY up a little & add putses for debugging