Started implementing scanning