Initial simplification pass -- config & startup
Basics working