Bedtime commit. Need to fix failing table lookups.