Updated OWM to use array lookup, in preparation for giving a choice