First solid pass at storing the data in a useful way