Update

Some behavior is working, I can't really explain it but it is closer
than it was.