Continued work on GUI replacement. Added test script.