WOD incomplete

Have to fix some null pointer exception issue