Keenans power routing

Merging branch work into master branch.