"Added TODO"
TODO updated
Added User data type and adjusted Me to work with it