Added all classes I have; Must decide how I want to design this.