Yeah, this is just a hacky patch for others to try out, clearly not ready merging yet.