Incremental changes, had a brief fling with gnome