streamlined all files to work with messages and proper service calls