some cleanup/changes
pass container instead of output to work and add setters and getter for container in manager