Data comes over cleanly now, still bugs to work out