Moved more functionality to achievements module