Major refactor to reduce use of statics and allow multiple tracked instances with different configurations