at a good stopping point with guis.
merge commit