Added forms and some adding/removing client functionality.