Moved stuff to base.
Slightly more parsable.