working on models and endpoints