Refactor of code and initial Comments API

Signed-off-by: AutomatedTester <dburns@mozilla.com>