Revert "Revert "WORKING VERSION ZOMG!!""

This reverts commit 74ee64e7e95b6e28037d7a8d2faef96f20f44046.