Adding some other changes before the big refactor