Manual scan

Let's merge this @RuudBurger , or maybe you have objections?