Begin consolidating/refactoring