Markus S
start to work on auth #amit