Merge Austin's graphics work back into master