Level 8 Completed, refactoring done, more later