Refactoring, JobQueue implemented ... still a lot TODO ...