Updated classes, think this is it before another branch.