Little more on data structures
Update some TODOs --> DONE