Major tweaks, but working on PivotalTracker