Starting to move CLI stuff over into Symfony console