Good stuff man!

Yeah, The Rollback is not an elegant solution, but for many users it might be a simpler solution than what you went through.

Cheers