Get it working for multiple traces; 
also only do magic numbers and validation once.