Still incomplete but more functionality
More functionality in cell formator