Lizard + Spock thrown into the mix; cucumber tests updated; prettied it up a little; still need CSS