Baxters branch

let's go over this: just some style and model changes