Fixed more issues so this can be demoed.
It basically works now.