Added some stuff for milestone 2