Trial

I posted some updates on my fork and now I'm trying to create a pull request.