Split up the steps better