refactoring continued - restored most of BabbageFaces functionality
(except update command)