Initial change. Should swift be separate or not?