Continued model development

New structure looks better, but still doesn't work.
Forced commit - No changes

Files were added to the previous commit because programs were open.