Working on Whileypath viewer