New testing blah code

Nothing special, just a mess of stuff
Updates to the main option functions