Switched to using pushStates and improved kicking off at the correct deeplink state