Major code changes
Simple traversing added