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/.
fixed 418ae0bd0f76c808055c76685bdeab94d5e59a72