Options Working

(Still need to set hashing factory for macro actions)