Remove this when finished refactoring