Added Core Plot.
Encapsulated model a little better.