Made some changes, introduced new classes

Signed-off-by: Tyler Janca <tejanca@ccwip.net>