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

This reverts commit b9075a0d8d08688229e0a2debc98321ac15e4042.
Revert "Revert "Separation of concerns, & begin pulling user data""

This reverts commit e5b503215740966cdbd8a48f693898139c6f93b9.
Revert "Revert "Revert "Separation of concerns, & begin pulling user data"""

This reverts commit 838ba7c748bddd1025c792998c15652b526e68b1.