Art mergeback

# Not Ready

Suggested functionality to merge back to main dev branch. Does not need to be Art specific.