updated model
should all be working
finishing up unit tests
tests done
fixed test bug