Started Table

* Started adding <table>
* Some refactoring