Restructured options code, volume options now works