This is also on my list to try and figure out a better way. State of things now is "make it work no matter how ugly".