Some tables populated

It was a tough merge please verify at ur end that ur changes are
working.