Finished beautifully stage2

Changes in loads of classes