Refactored, wall trace interfaces, completed fill