finished models and added new classes for ingredients and join