Re-seperate command handling and aggregates

Antonio didn't like this. We'll decide eventually.