Done some more assignments