jrouge/WFU-3305/Work4_Core_episode_3

This is a sub pull-request of https://github.com/Work4Labs/work4core/pull/7