Addressed comments form @adamrp and @eldeveloper

My only other thought it should we only do this after the kit
has been verified?