Bigger changes

More to be done soon.