Done some of my part