Major Change

Fixed model and design issues.