wip: ActivityModel and ActivityCommands