Yes, definitely.  Will re-commit soon.  If you want/after review I can squash all the commits to a single one.