2nd step now almost completly implemented