partial rewrites WIP