Start draft of options and add #TODOs on modularity