Work in progress with Authentication => almost done