Bug fixed for initial production
Resolved merge conflict
Added notes completed coding