Added dictionary class, updated main accordingly.