Options now fully implemented