Cleaned up and modified the model

Find inserts under resources.