Committing to stash, so Patrick can work on it too.