Many changes, it's all a bit of a mess but slowly making progress...