Crystal Ball Project: Refactoring Into a Model