WS and comments
Initial preview of new path handling