moved default options out of the way (may bring them back later)

Work in progress, no need to review just yet