WIP: Modularize experiment