Adding upload system (see #1)