Added (partially) a statement system