add Stmt to fix arguments on, add rules to look at