TABLEVIEW DONEEEE i think
fixing conflicts and merging