Changed structure, rewrote User class