Make 09 pass, needs refactor.