Develop

HW6
another set of epic changes)