Top part working, step function in progress