WIP: WordMap Updates

Fixing #1312
Currently in progress.. :smile: