Add data structure
Finish assignment

Hopefully this finishes the assignment