Major overhaul to include a configuration system