Third draft of multiple atlas support.