Rewrote a big part of the library.