DO NOT MERGE (yet): hope this was it for the machinetalk merge