Add now working
Merge commit for Add class