WIP: getting toward final experimental setup