More work completed on unlocking achievements