#22 - Refactor Console/Command to allow unit testing