Rewriting internals.
Get rid of junk.
Update Tests.