Starting on new settings
Starting on separate config properties
Finished up assertions and extensions