Done, but without tests. It didn't seem that important.