More GUI work

Added a basic test, and also start to address #36