WIP on refactoring some scanlist parts again