Updates to Historical PowerTrack library and more work on analysis framework
Merging