Lots of changes

Not all good, not all bad…