Added some table stuff, also added things to yaml