Heron v2 plus some juice

completed