move all uploading stuff back under form