Started adding configurability

Main loop still doesn't handle this, so it is broken.