Working version - baseline

Working version - baseline before code review