Merge
Merge
Auth: App blocks public, rest of implementation commented out