Added Tables, Started Main Econ Calc