Revert "Broke a few lines but just needs formatting"

This reverts commit dea4ae0027621181c1bc2a8b03815adbeaba2bae.
Revert "Revert "Broke a few lines but just needs formatting""

This reverts commit 9dad2e91d0a2003e8fe2b07d9a911554e8849f6e.