Reworking...

Still quite some things to do.