Some more refactoring
metal worker half implemented!