Changes

Alot of changes.