got my feaure working!  Whoo!  But not the cucumber :(
Merged with master. Resolved conflict. Merged profile pages. Added a migration.