Trimming right down to the interfaces, all rabbit references now removed