Don't use this yet. This is just a quick hack to close an internal ticket. More feature complete version will come later