Added data folder and files, fixed up some code.