Finish class 5 and add data files