Added more functionality, created setupTables and insertButton, added some tests too