refactored, began building out users