Initial checkin for server and ui