Restart

I restarted from scratch. It isn't yet synced with the old project but
there is some new stuff.