Fnished this for now. However there is a new table which isnt buld in and not synced yet with the repo.