Minor refactoring
instituting emergency crisis mode. still needs to be developed