Also moved some methods around to clean up the classes Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>