refactored a few things, changed method for grabbing names