Finished refactoring Model and System. Checked logical flow on sh3. Works.