Added GUI and tests