Fixed #16, started implementing UserActivity