Revert "Attempt 2!"

This reverts commit a5fb24595495660ce7aed5bd6e62876a80defa7a.
Revert "Revert "Attempt 2!""

This reverts commit f879a984de00bd2132a2315974fede46ca1e42d3.
Final