added conditionals and test/logic.marbles and it appears to be working