Rebuild command handling and added channel saves