WIP tests passing...