Fixed bugs, implemented steps within steps, and set foundation for easier additions of steps