Working on tests. About 75% of the way done.