Added Options model and class, may need re-factoring tomorrow, calling it a day...