Refs #0. Fleshed out additional models as per discussion with Marcus (some changes apply)