M2- Milestone 2 for NullFever