Add hop count to stats
Resurrect CommandHandler, will be needed in CLI-only tests