Uploading context/action managers

... before I gut the code and simplify it.