Fixed an issue with rendering Points
Preliminary solver
Handles the most obvious situations from a cell/point level