Got resolve working