Move conditions to new file and remove excess stuff

already had a closure in the timeout 'n make the list easier to manage or whatever