Down to two classes to be updated

Signed-off-by: Chris Sanders <zidane@outlook.com>