added a bunch more scenarios. broke things. fixing them.