See the last commit for important info. I just forgot to delete a couple if statements that no longer matter.