Cleaning up, need input class.