Specs

Please review my changes.  I added some specs to back up the re-factor.