oops. some list comprehensions were screwey, battery died earlier, couldn't test before push