Removed else condition for the time being, add bug to set a default for the condition of a bad argument passed in