hpa-todo was jacked and so testing out new branch for issues

Merging the changes from Hpa-Todo conflicts required new branch.