Tables to cards [PD-519]

For review, still need to fix tests.
Can we remove commented code now?