Committing

Keeping the existing user structure - need to add Claims based