Achievements logic still needs work