Mostly functional.  Still need to touch up the code, and repatch the activitys together.