Add solution
Fixes

Latest code in production.
Fix updates

MAke updates