Revert "Revert "Speed Stuff""

This reverts commit 20f8ef94c30633547f5e03818b7cd4bc2f227487.