beginning options change

Made options param in less than 10 minutes (didn't have much time to test it), took out the tests because they'll probably all fail until we finalize the options param.

Let me know if this is the direction we should go.

*(see most recent commits from my fork when you review this PR... I put a bit more time into it. Looks like ~half of the tests are passing)*