Ttt users

Merging user work and angular implementation.