Initial refactor commit
Working on experience
Initial complete pass
More work
Final touches