Just wanted to tag this with a comment so it doesn't get lost. Need to probably confer with shackbarth to find a better solution here