Fix conflict
Merge from origin/broken
Add vector based points system
Fix conflict