Add some steps, maybe automate this later