working through rewrite issues