Major Update

Cleaned House