Updated per Forrest idea realizations

Pairing session w/ Dmitri; blocked out new Cukes