Updated before integration to classes.

Signed-off-by: Tim Argentino <ninjaoctocow@gmail.com>