Bulk upload move to aliss/staging.

Moving changes from my local repo to aliss/staging.  Still in need of a cleanup.