Fill out controllers more