Added GUI work