Client model + form. related to #19