further work towards refactoring and simplification via macros. single host deployments should work.