Re-designed + Intellisense almost working