Fixing data transfer

Data is now being passed correctly; wit now recognizes when to proceed
to the next step and go back to the previous.