Made Some Changes (Untested)

Note: cannot be tested until all tables are there