More classes added (walker) and other refactoring