Refactored simulation - now uses db-based model