Code review; add some controllers