My branch to try some fixes in.