Another partial refactor