Updated docs & Almost finished expand code