I forget what this commit was for but these maps look promising