Returning command check back to messy if/else. regexp was not good.