Code expansion, still a ways to go though