Reorg to be the same as non-swift tutorial