Added commenting to these classes