Work on adding custom commands