Add functionality working

(kind off)