Refactored to Bunny and all's well
refactored and added latch
reworked test for bunny and a couple small cleanups