changed to -> syntax for structs
finished the merge