Tons of progress (commit more often, dickhead!)