Added various new functions, most work done on Table class