Removed dead code, updated arrays to Points, finished writing functions