Making some progress on draft