merged interactive/noninteractive

split was stupid in the first place...