add tables to app / needs refactor