WIP: Better rolledback!