adding in proper intergartions and building