tests passing, coverage at 97%