5/18/2014 (2)

- Adding forgotten classes from commit 5/18/2014.