New changes and additions from

Lauran with extremely tight deadline and I need updates done by 3pm