More tables, couple test controllers, etc..

More tables, couple test controllers, etc..