Ianjorgensen/hover highlight

@jebeck Ready to review. Pulled the changes from master. I kept to code clean to make it easier to transition to the wizard im working on