finished up activitya1, added activitya2, need to test db