More sane loop structure.
Progress on more efficient carver....