Finished up basic Scanner