Delete TODO - most of this is done