Restructure, now that we know how to assign controllers