finished more stuff :DDDDDDDDDD