End game needs work