Adding numbering or text field (for names) for Tokens

Just went through my first session with Roll20 last night (running a play test for D&D Next) and I was playing as a PC, although I do plan on running future play tests as a GM. I'm liking the interface and system overall and am excited to see what the future holds for virtual tabletop gaming. My one gripe from yesterday was that it was somewhat confusing designating which target was being attacked and tracking which token corresponded to which minion I was keeping track off on a spreadsheet. Would it be possible to add a display field, similar to the colored circles, or even a complete text field where you can display a name or number for each individual token? The only work around I currently see is to manually upload each token with a number added via image editing software.

This would help me as well- not just to name tokens, but to keep track of basic attacks so I don't have to add it to GM notes and whatnot.

Until they address this issue. Here's a little trick I use. It only works for baseless tokens though (the tokens that what someone above directly would see) In 4 easy steps: 1) Select the token, 2) Edit it to give it an aura of 0.5 feet, must include the zero, 3) select a different colour for each token. 4) Ease your players target calling.