New command line interface, with access to new geometry