I didn't really take care of the config in this PR :).