Marc [WIP]

this is based atop #10