Added the form and the ability to add commands, and fixes #4