Moved stuff around to bunny.h