fixed it up, got stuck in an infinite loop