completed rewiring of framework