Added colors for units again. Refactored to allow for restarting. Restarting broken