Attempting refactoring
Removing mention of ONELINE for now