Bunch of changes, still need to pin down the configuration