Done some more stuff