Latest code. Need to send data to next screen still