master: Adding some more stuff like another controller for saving client information