condense controllers down further