WIP: Refactor to simplify.