Done. The code seems less logical to me now, but what do I know? All we need now is some sort of GUI... :)