WIP: More leaf cutting, clean up.