DJ, Charles & Greg: refactored and expanded python service