FINALLY got this all to pass