>>/17636/
Merged the first one. Not very clean, but I'm in a rush at the moment. I'll work on the second later.