added memory to data
merge stuff
merge issues