Add class form working
Conflicts resolved