Added some stuff for intell

a LOT OF WORK comming ...