Commands Refactor Part 2

We split #196 in two parts. this is the second. (#262 is the first). This builds on all the changes to commands/.
could you document want this handler is supposed to do and where it fits in? not obvious from this file alone.