Moved Containment functions to seperate file, changed visit in Stmt to switch