Resolves #906. More or less a straight re-implementation of the existing impl with changes made to use IR analogues as needed.
square
