Refactored all models and seperated queues.