Revert "Revert "Revert "Revert "Separation of concerns, & begin pulling user data""""

This reverts commit 3f98aa27d7dc22040997cb5d0d004026080d7005.