Adding point class--gonna be a big overhaul