More testing

Restarted old file, relying on library use in the future instead of
trying to separate now.