CI Tests passing, added comments