Reorg, Rspec, and working code.