TODO changes, minor service refactor