Major refactor to immediate/displacment operands