Made Table "bootstrappable"
Merge origin/master
QA Lookup stuff