Committing working version before doing crazy things.