Yeah, probably. We would still have to serve it through this method though, because of the templates. But it would be good to get rid of the magic number, at least.