Committing attempt to use models
Revert "Committing attempt to use models"

This reverts commit fae31087756cff0267ebdd4ed6ee78af9547cd45.
Massively cleaned up code. Working version