Do we know when we're going to rewrite this properly?