Working on creating stateful upload capability
Commit latest set of changes...