Fixed null pointer exception. Commented out load code for now so that testing data could be used