-finished porting to new config class, all tests passing