removed some depdnancies that werent needed to be shared.  Rather passed things in .  Also fixed up session stuff