commiting for now
adding data files
small refactoring
done with refactoring