updated models to take advantage of django built ins