Draft Load Update

Address #644 plus some cleanup