huge amount of updates reworking the rendering... preparing for filtering and sorting