finished milestone 1.0