Added two classes, updated main