Draft updates refs #50