Added range checking pass. Testing now