added full data, good to start testing
sort of working