GAP-inspired shirtdress (AKA M5847)

I came across a piece of sandy-khaki colored fabric while sorting out YABFF (Yet Another Box Full o' Fabric) in the basement yesterday.  It's sort of a brushed cotton-y, rather drape-y piece, about 3 yds of 60" which I am thinking about using to make my own version of the GAP khaki shirtdress, seeing how military-inspired clothing is hot for Spring 2010:

What I like about this dress:

• Drawstring tie belt at waist
• Buttons/tabs at shoulders and hem
• 3/4 length sleeves
• Shirttail hem

What I want to change:

• Patch pockets over my boobs (not sure exactly how I'll change these); may add/substitute gunflaps at shoulder instead
• Princess seaming (a la M5847) with pockets in the princess seams, rather than the side seams
• Maybe add back yoke detail
• The rolled up sleeves...not a fan

I'll need to draft the pattern for it from my Unique Boutique dress pattern, though, as the M5847 I have in my stash has sizes 14-22, and I need a 10 or 12.  This will be an interesting experiment, morphing the two patterns together and then adding all the details.  I have an old Burda WOF with several dress/shirt designs incorporating tabs/epaulettes, so I'll probably lift a few of them from there.