Rabbit v1.0

This is a work in progress and will represent the changes needed to go to Rabbit v1.0.