structural analyzer, find/what

need to strengthen diagram parser