updates on datastructures
merged the conflict, moved some of the discussions from discussion to research plan