finished milestone 2(probably)