Got increment working a little, but broken a lot.