Switch name over, get points and all tips list working, refactor