Working towards getting tests passing.