cleaned up service file, listed functions that are un-finished