merge with Daniel (add GWT UI)