Still working on models, and sync