Modelwork

Nick had issues with gitstash/pull--rebase so got him to make a branch so I could bring changes in manually. May later cause conflict with mai's recipe page work but will deal with that as a separate merge