Working, need to add scan logic now..