Added a class, Modified 3.
Updated todo and changelog.