fixing hand and continuing data server implementation
fixing conflicts with malcolm's push