Implemented some pending specs.  Story #205