Funcs added - needs specs and implementation