Been far too long since a commit.
Commiting many changes for a later push.