More classes copied. Not tested yet.