Continue implementing points calculation