Add dynamic server configuration

Also clean up some older stuff and make some stuff better