milestone 4, round 1
final (hopefully) update