Something is still fucky with the logic. Going to sleep on it