An intermediate refactor version for play on. Also a new TODO.