Coded some more stuff