I think that sounds good. It's difficult to make it broader, since they each have their own requirements, housing, and diet differences.

Plus nothing like adding a monitor enclosure building...