There can be, maybe that could be part of a separate branch.