Tmp Hackery…

I need this functionality now. Will clean up in next commit.