Moving things around, spliting out individual steps