Update project

In progress, sending pull request for comments.