Submit class exercises

Please fix this merge conflict.