Patch Set 2: Looks good to me, approved; Build Successful; IP review completed

(1 inline comment)

I'm pushing this in for now. There's a bit of work we can do to improve the UI and code but this is OK for now.