milestone 2 final commit