Refactored adding commands + completion funcs. Fixes #31