Rewrite to allow for instancing.