Added TODOs at the type checkers uploaded - Turn state into immutable
variables propagating through calls