Updated Header
Merge
Basic Cleanup