Adding upload facility, timer fix and parsing.