Added multiple classes, basic configuration.
Minor changes