WIP - more argument parsing, trying to handle @app.env accordingly

WIP - more argument parsing, trying to handle @app.env accordingly #1826