[WIP]: Feature/activity