Revert "Adding work on making this a better place, running out of time for now"

This reverts commit cacbb2111e0fa86c608f86ef2b39d976ea1d2971.
Revert "Revert "Adding work on making this a better place, running out of time for now""

This reverts commit 2d0cedd5e6ab9050534ffd3fb910b2cb35eb46f0.
Revert "Adding work on making this a better place, running out of time for now"

This reverts commit cacbb2111e0fa86c608f86ef2b39d976ea1d2971.