Updates in Progress

Some changes have already been done, more to follow over the next couple of days. Things may look wrong or not quite work properly but it's all a work in progress while it's all going on.