Initial commit based on team feedback