add Session object
fixes/rebasing for new model/controller structure