Added Forwardable code to a couple data objects. Fixed a step definition that was too big for its britches.