Big update, still more fixes to go in, but wanted you to be able to see
the progress.