1st Round of Updates

Laying out all changes for future use!