Yep, I think you're right here. All this should be moved to ActivityHandler in the end.