Adding functionality complete