psushing and pulling updates, trying to integrate everything