Rolling back a bit, modded table now

Leaving the advanced bench for now, will come back later with more time.