Rearranging some vars to actually contain data at the right time