Some updates … I don't really know how this is supposed to work.