Yes, this would be very awesome and replace the html expansion now, which is buggy