Done some more
few more complete