General
adding
Alot of changes