Started on support for the screen + qr