Major refactor.  Rewriting fuego service...