WIP at init options, cleanup