Marc

this is based atop #10