Initial import of CUploader v 2.0