Updated plan to use an instruction mapping instead of an if statement

This is the next step in #997 

cc @asmeurer @ilanschnell