Made critters addable, but nothing cleaned up yet.
Resolved merge conflicts