Fixing everything

I copied everything from the Old branch to the master. The attpempt at
rewriting the project ceased and I want to go back to functional code.