Time to move on

I think is time to move all this stuff to master. We do not have a nice user interface yet, but the core functions work well.