- This may be temporary, depending on the ultimate implementation. This is intended to ease into the refactoring.