Soo close to having upload catch done