Add in logic for supporting naught to app.js