refactored, updated, added models, images