Added a nice input wrapper. So much cleaner than what Cloudberry had!