realy working now, need to add more tables