model stuff.
fixed merge ugh.