Updated Data Strucutres and Began testing