Making progress on this build. Few more things to clean up and I can migrate some components from my old system here.