back to square one
Revert "back to square one"

This reverts commit 3d84e9fd4f2926055074a0ccbb0790b99646cab3.
yess! fixed the friggin bug!