refactored and only commands we need for guard in for now