Refactor add method. Start working on CLI.