Combined our types into one big happy type