More stuff

Still need to implement searching the data structure.