initial draft finished, test done