model almost done, needs a few more tests