Added multiple input support, tagging, maybe something more