Fix some of the config logic
Move stuff out of the constructor