WIP: Reducing complexity