misunderstanding. The logic has been shuffled around, and everything is now much cleaner