did some work on models and controllers