New configuration system!  Working, with few bugs