Complete re-write of the whole lib.
Method re-name