Continue working on the activity server