Added classes, wrote logger