Revert "More testing, doesnt work right now"

This reverts commit da05b6694b7b7f21808efabd4c4b3bd989b8d472.