Work on getting specs to pass, now to remove the dependency on
activerecord