Converted to modular app, with authentication