quick refactor to separate activity creation from the other stuff

# What's this?

This just separates the activities building stuff into it's own method. It's not ideal as it's all still in callbacks but for now it's ok.