Changes for User Class

A lot todo, but it's a start