Added classes + tdd