First step in starting to break up the lap tracking into more modular and testable peices