Began implementing non-yml commands