BROKEN: Some refactor work.