Massive number of changes to get table-based timing model calculations to work