Revert "Revert "Little bit""

This reverts commit a8de8abe181dc3bdb19b0aa0989e87d7b353ac9f.
New stuff + workaround for the weird method the dude had going on in the position switching method. Simpler is better yo.