Broke out user-defined configuration into separate file. Cleaned up base