Working on profile fields. Lot's of clean up.