Tweak IR

There are still a few commits to go. Creating the PR now for testing purposes.