Initial commint of project v0.2