Fleshed Out Two New Classes 

Signed-off-by: tobias76 <maximumsectoby@gmail.com>