(enhancement) moved sitter stubs to separate file.