Progress in Solid-State implementations of Quantum Computing