Some changes ahead of a (hopefully) major refactor