Added user basics
Further work