shifts line up correctly, need IDs for each now