work on models and controllers