final commit for milestone 2. prototype