Jrouge/wfu 3287/work4 core episode 2

This is a sub-pull request.