Modified TODO
Added Spanish version of user-end functions