added final activity -- still has some bugs