Recreating old merge request submitted by Peyton Caine 17 months ago to update Iris-Factory. This merge contains files added by Peyton and Jeremy along with all other updates that have occurred in the time since the original merge request. !162 (closed)
