* Add stack functionality to the FocusManager

* Separate out the highlight manager from the focus manager

* Revert more unrelated changes

* Review Changes