Talks code refactor

This is a code refactor to ProMotion. No actual visual changes. That'll come in another PR.