Start work to increase modularity of solution options