First Big Update

Lot of changes