Rewrite finished, adding more ops