Updated manual URL
First implementations
Crappy tests