7.x 3.x art

# Not Ready
Opening up a pull request to see if we can bring in the Art changes. I have been putting everything into micro modules so this may be possible.