Refactored Application logic away from mesh logic