More changes and updates.

Need to look into the downloading method to determine if there is going
to be thread blocking.