And another gazillion changes

Everything works now
Except the navigation