Added range checking on with track ranges

Signed-off-by: robertsonics <jamie@robertsonics.com>