Further Initial Commits

Includes further work on the options class