Change run command to cleaner implementation and multiple commands. Fixes #1