Working on fixing typedecs
Almost done with ch 5