keep track of more values
some work on section C (entities) but it is nowhere near done yet