Tested go out and return, worked!

Added return logic and changed some timing values