finished first version of third milestone