Some progress on auto targeting
* Will be changing this to use a listener (onAppear/onDisappear)