Moved rewrite to master.
attempted merge