Pull request to merge John's changes with recent kat-gui progress