Adding all local development to a new branch. It will be merged to master after
this commit.