Added a temporary checker and filled in some more tables