Building out classes

Signed-off-by: Kevin Rabello <kevin.rabello@gmail.com>