Major overhaul on models, add to admin