Added data objects and began skeletoning the Scanner