Move these guys up to MAKE_ENDPOINT