[Broken] Continuing work on model

It's being a long way... ¬¬