Initial commit (extraction from app)