Modifications to models and settings
Initial commit of new files