Started adding table for printing and excel