Added @todo & re-factored git-branch a little bit.