since/until parsing complete in register_class - needs tests!