Sixth commit - linking and authorization