Adding future support for limited rewind.. committing before merge