Extract count into command object

Makes way for new commands