Some very old commits from my master branch ...

These should be reviewed if they are still viable.