nullpointerexception fixed, pushing before making large scale changes