i wonder if it makes sense to keep these two in the same file or if we don't rather split this.