Working-ish Version

Still some bugs with Tables.  Code needs to be majorly tuned for cell
handling.