Fixed the null bug, probably going to remove the mapreduce because it doesn't really make sense here