TATMMarker -> TATM leftovers
More commenting out to fix broken compiling