2 0 updates

Note I'm still having issues with a couple of the specs.  I think I may need to start the failing spec from scratch unless you have a better idea of what's going wrong with it.