Merging in new UI and server/client code.