1-28 Mid-day commit

Working application