Improving Intellisense

WIP

Last updated