if you're comfortable with git, keep the commits separate so we can follow progress more easily.
then, once it's finished, squash them together into logical units or something