Sorta finished commenting my stuff
Need to meet and discuss before final changes are added