Almost fixed branch
Everything works!