Making it work.... but I'm not proud of myself for commenting out Coverage code