Started adding object passing between activities, but it doesn't really make sense.  Need to look at this again.