Fixes #1 WIP all models