BROKEN: Half way through Ep 7 refactor