Major Update

Lotsa changes