Almost working more fully features table

still loads of hacking.