Got the non-interactive version basically taken care of